Fixed Bug 1096215