Fix bug #1