Fixed standalone setup.