Fix state issue