Fixed another bug from the refactoring.