(!) Fix: Problems with Smoke