Least invasive means of solving the problem

This is a solution for issue #422. There were several options - this was straightforward and minimally invasive to existing code.