bug #17 fixed