Raman - Fixed #987