Added support for fallback mode with no X