[1.2.5] Fix #1637

See #1637