Add tail data back in #SGoo-59 Fixed