more struct fix