Fixed some problem with diff