Fixed tag controller yet again