Directionality of tokens now properly managed