templates issue fixed