works on mac
fixed conflict