fix applying changes