Fix #856