Fix critical error between change states