As part of the 16.1 update I had another look at this issue and I think this is only a problem with older templates, if you recreate the template by creating a new one and copying over the content I believe it shouldn’t happen anymore. Let me know if this is not the case.