Fix: Add fallback during code transition