Fixed Bug 1051584