Value type - struct problem
before rebase