Fixed quote problems