Fix #861

See #861.