Fix #1575

See #1575