[ci skip] Fix #861 (regression)
5 files changed