[1.3.0] Fix #1480

See #1480