Fixed bug #3