added handling for old tails