[1.2.4] Fix #1284

See #1284