Fix #854