Fix #1091

See #1091