Fix #2085

See #2085