modify from mac
fixed merge