BZ-1054822: fix standalone mode