Fixed getValuePair()