Fixed Bug 1041732