Fixed bug in OSX 10.7.x