R2D2 fixed for OSX