Fixed bug #8