Enclosing header propagation corrected