fix /tame

change on variable assignment order