Fixed bug #10