Mpns regression fix