Fix for the WPI parser.