DIY fix_before