Fixing Issue on mac