Fix #1494

See #1494