Fix encoding and fix for destroy method

Fix encoding and fix for destroy method
Merge pull request #2197 from AdaskoTheBeAsT/master

Fix encoding and fix for destroy method