Fix bug #10