[1.3.0] Fix #1399

See #1399