Fixed Bug 2, Updating issue