Removing critical bug