Fix #798