Fixed bug #13