This should fix issues with the diff stuff