Standalone workaround