Fixing components list