Rivet tweak to fix offset problem