Fix #1099

See #1099