Auto cap off bug fix