fixed missused substitute