fixed #804 stop to fork the likes