Fix to support MWP