fix Pair classes