Ashwin/Ajay | #2744 | fixing export of subject