Fixed for ComponentJS