Make change sets id consistent (#246)