Initial fix so this works on Mavericks