bad substitution fix #2