Really fix #806