[fixed] stability issue

Change-Id: Icd9eb04ba28933804bec863a7e246e23ed918677
[Fixed] templates on a couple rebel mobs

Change-Id: Iecca2072d1dae5a3f1c7cb5ecf81b9686c8f76b8