Fixed for Andrew's Mac Env.