Number headers - master

Tested the fix on master too.