Fix #1828

See #1828