Fix issue with removing ampersand on save