Updating: fixing BUGS/bug-2014-11-14