fixing #1486 for 1.3.6 on release-1.3 branch
Merge pull request #1502 from jguille2/release-1.3

fixing #1486 for 1.3.6 on release-1.3 branch