Fix for component scan