Fix #1397

See #1397