This is no real fix for the quoting issues, need to come up with something better.