Hotfix for components in tools