Attempt to fix bug in Mountain Lion. Pending testing