[1.3.0] Fix #1284

See #1284