OO version - bug fix statement line - UNTESTED