Components registration fix