(fix -) Fixes bug from refactoring