Hotfix tagging timestamp