Fixed tail code that was causing test failures in 0.10