Fix tank drain issue

as in 6.X