bug #29 partially fixed