Sidecar fix