Fix standalone mode