Rework token fallback