Fix for issues #3931 and #3932

Test to prove issues #3931 and #3932