Fixing template (was using variables in a deprecated way)