[1.2.4] Fix #1263

See #1263