Additional fix from the previous refactoring