TAHelper replacements fix