Handle STANDALONE+SYSTEMWIDE case less strictly