Fix bug in substitution suggesting