Ensured using selectedBuild:
Refactoring