Fix bug #7