Fix tag setting, thanks to Wim for figuring out the issue for me