Ajay/DC | #0000 | Fixing smoke - reverted removing of encoding