Fix bug #4