Fix: regression with refactoring (was not covered by tests)