fixing struct