Fixed another issue from refactoring