Hotfix/fallback port

Hotfix/fallback port