Fix undefined
Fix sturct type