Fix #1449

See #1449