template compatibility issue fixed