Force token
Additional fix