Fix after small refactor in previous commit