Fix fire starter bug