Corrected question/template substitution
Actually tested code :)