change handler fix