Fix an issue with cycle breaking with multiple short codes.