Fix Token stacking