Giulio remarks: change pointers to non-pointer objects