-fixed missing struct's