Added code to force the removal of the drinking action after drinking.