Fixed template helpers