Issue #8446 by cableman: Fixed issue with headers in blocks