Fix state mechanism