Fixed issue with quotes not working right