1.6.1 port, liquids still messed up