Improved fall back mode