Fix bug (should add test for diffing)