(- fix) Fixes bug introduced by refactoring