Fixed bug that was introduced from the refactoring