diff file line bugs fix