Attempting to fix a bug with tags retrieval

I can't reproduce the bug on my system, so this is just a guess