Fixed component crashing issue