Remedy a minor code refactor issue