Fix #872