Same comment as above, to reuse the fixes and avoid copy/paste?