Fix #1451

See #1451