Feature #2653: Temporary fix for stand-alone mode