Issue 3994 fix
check solution to issue 3994
Merge pull request #4 from smichr/3994

check solution to issue 3994
Merge pull request #2594 from zanzibar7/issue3994

Issue 3994 fix