Should have been added with previous refactoring commit