Fix #1529

See #1529