fixed deprecated prop substitution