[1.2.5] Fix #1654

See #1654