fixing latest git problems with work from Roberto and Erik