issue #21371 submitting change from attached patch
Merge pull request #54 from gpazo/21371

issue #21371 submitting change from attached patch