Attempting to fix weird OS X only issue