#25: Fix issue with single quotes being encoded after saving