Fixed Bug 1070073