Fixed for Linux - pushing to test on OS X