Fixed bug with quote on the end of strings