One more attempt at fixing quote issue