you can only claim the treaty if you enter the us with H1 or J1 visa, not for the people who transfer from Fi to H1. The treaty can be used for the first three years. so I do not understand your case.