FMWP fix