Fix #792