fix issue #34 - #37