fix tailing support