fixing mixed quotes issues