Fixing componentscan bug