- Trying to fix properties encoding in message source creator;