Templates looking in wrong place for information

Fixes #614