fixing handling of structs based on size