(!) Fix: smoke stuff