Fixed for working on Mavericks