fixed Bug 7