test for fallback mode
fixes for fallback mode