Bug 5563 fixed