Upgrade and fixing bug.