Be more careful about tail usage