Fix bug #6