Fixed Bug 1089517