ComponentType fix