Fixing soap to run as standalone too