Changed for macosx