Fixed bug #1