Updated issues 2009 and 2074