[1.3.0] Fix #1637

See #1637