Fix WPP decoder