Fix for typos introduced in refactoring