fixing jega Disaster BUG