refs #239 - fix issues 1,2 in ticket