Fix from refactoring