Fixed bug #4