I can confirm that the above does fix it on the extend version. Although it’s not necessarily counted as a bug my opinion would be that this is certainly a fix that makes the theme more reliable and therefore fit for purpose.
I can definitely recommend the extend version!
Is the extend version now updated? Therefore am I best replacing the version I have with this and removing the custom header information? Are there any other changes with the updated version?