[RFR] Fix bug in previous refactoring