+ and another gii fix