Second attempt, fix Mountain Lion bug