Fix bug when doing a variable swapping :)