Close #36 - Restore the size of header options