Tail bug fixed