Fix bug #818.