Fixed struct issue