Fixed Bug 151