Fixed bug on OSX 10.7.5