pushing the template problem upstream