fix some parameters for DPQ macro