Fix unexpected change error