Fix #1362

See #1362