Fixed and tested version under OSX 10.9