Fix bug that could cause problems on OS X 10.7.1 & 2