Fixing 1.8.7 for Mac and Linux