FIX false rebase back for new variable handling..