fix for issue #35
unit test fix