Fix tank drain issue

as in 6.X

(made for branch 6.1.x)