fixed struct address in main
merge