Fixed destroy and change