Fixed bug #2