Added Tables dupe fix (Not tested, at all)