Fix #812