Fixed missed error from last refactoring