continued work on issue #237 - testing and fixing