Fix #863

See #863.