Bug 10 Fixed