Fix support of string headers