Trying to fix the gitz