final fix for mac