Fix OSX 10.10 compatibility issue