Fixed bug #7