Changes to cigarrete smoke 

A partial (or perhaps complete) fix to issue #9360. Actual credit goes to BevapDin and KA101.