One-liner fix for issue #773 and new unit tests to exercise that area.