diff application bug have been fixed