Revert "fixed assign structure"

This reverts commit eb00c73bf5b9646f3954405db07c47dbd1da2e49.