Currently working perfectly on OS X