Fixed standalone functionality