Part 2 of fixing drinking

* This SHOULD let you drink anything, please test as always.