fix issue #64 (all tests pass)