Add workaround for BC tank drain(), Fixes #365