Fixes containsNonSimpleHeaders