Fix #2081

See #2081