Fixing issue with applying multiple changesets