Fixed Bug 51