Workaround for new tag issue