Fix #947 by updating inspector controller after templates are applied.
Merge pull request #1171 from rkachowski/bugfix/947

Fix #947 by updating inspector controller after templates are applied.