Fix bugs for Paul Request