fixed broken refactoring. See previous.