final pass - resolved #961