Manual patch for the bas bug for OSX