Fix for 2nd half of github issue #52 with new test