Fixed creating Components