Fix tank drain issue

as in 6.0.X

(made this for branch 5)