Fixed Bug 1070070