hotfix for saving tags