Fixing loading of components