Hotfix: Fallback works correctly
Merge from feature branch