Fix problem with local substitution properties not applying for security props