fixing #1486 for 1.3.6 on release-1.3 branch