Remove fallback furthur to try and fix iOS bug