Added missing check if MWP