Fix for MAC OS X