Fix #799