(#2381) - Follow up, supposed to be smaller header