Fix #1919

See #1919