fairbairn fix

In Progress