fix little template bug and play 2.2.0 suport