merge with original version on linux