fix pair-value problem