Fix #2069

See #2069