Keep things backwards-compatible for now (on OSX)