Updating: fixing bug-2014-10-29