Trying to fix tags bug