Fixed bug #11