Fixed bug #9