Yep, do it now while it is apart so you do not have to do it later. And I would not have that guy do it if he is questioning you like that.