fix standalone mode