Bug 130 fixed