Fixed bug with double quote marks or single quote ones