Fixed bug #20