fixing merge from master on Mac