Fixed bug in quoting/unquoting string