Feature/issue 197

Added fix as suggested by ksvhorn in issue report.  Added test that fails in 1.3 and passes after fix.