Fix liquid handling