bug #6 fixed