fixed standalone work