MPA updates
Fix encoding issue