Fix Incorrect substitutions #364