get it working on os x again, sorta