add #1466, might need model replacements