Fixing double escape problem

This fix is just made in the core for future versions,
but in the mean time let's fix what's already uploaded
manually.