Fix #1467

See #1467