Part 2 of fixing drinking

* This SHOULD let you drink anything, please test as always.
Merge pull request #6 from mistad/patch-5

Part 2 of fixing drinking