Fix for WrMf