Fix for MWGR5