3426e0103b
Fixes #1303. (cherry picked from commit 83438644dcdc470517f67c0d55ff4889f71cc435)
Fixes #1303. (cherry picked from commit 83438644dcdc470517f67c0d55ff4889f71cc435)