Fixed bug #5