fix struct -> class