Raman - Fix for smoke & FT