incorporate issues raised in issue #19