Fix #1486 for v1.3.0

Fix #1486 for v1.3.0