Fixed Bug 1053