Control: tags -1 patch

The attached patch should fix this bug.