[1.2.5] Fix #1783

See #1783