Bug 6 Fixed