Fix for parser RFC5545 compliance