Fixed another regression due to renaming of substitute function