Implement #893. Fixes TC dupe bug, thanks @ApocDev

Signed-off-by: Ross Allan <rallanpcl@gmail.com>