Second attempt to fix smoke bug.