Fix #1534

See #1534