Fixed Changes generation behavior