Bug 18 fixed