Fixed the arbitrary-tag controller logic