new fix for struct arguments