Fix bug #295