Fix #2085

See #1085