Fixed Bug 1011295