#230 addressed errors found by Liz in comment 11 in ticket