Fixed standlone bug