Fix #794