fix some q