FAIMS-344 - fix the arch16n substitution problem