OSX Compatibility Fixed