1.61: templates data() field overlap fixed