Fixed bug #6