fix issue #3215 - merge PR feedback