Fixed error due to previous refactor