fixed override of evil-substitute