fixes #5183 - address PR review comments