[1.3.0] Fix #1314

See #1314