Make substitute work