Fix bug #855