Fix #1501

See #1501