Fix for Nick's Mac