feature #2262: fix default substitution