Fixed the components