Fitz fix: Road to 409