Fix type substitution with a very bad fix