Use latest wat_catcher