Fix #7 in Mavericks