Fixed bug #12