Fix for stripping quotes