fixes #351 templated statements