Fixed issues with quotes