Fixed bug #16