Trying out a different patch for OSX