Fixed problem with standalone