Fix the coffee-bug :bug: