Quotes bugfix