Fixed quote problems for now