Fixing possible problem with fallback