Fixed bug #168