Fixed component bug