[c12487] Improve alcohol handling