diff --git a/src/rds.c b/src/rds.c
index a526d42..34e6427 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -360,13 +360,15 @@ static void get_rds_group(uint16_t *blocks) {
 			goto group_coded;
 		// TODO: Add EON
 		case 'X':
-			idx = rds_state.udg_idxs[0]++;
+			idx = rds_state.udg_idxs[0];
 			for(int i = 0; i < 3; i++) blocks[i+1] = rds_data.udg1[idx][i];
+			rds_state.udg_idxs[0]++;
 			if(rds_state.udg_idxs[0] == rds_data.udg1_len) rds_state.udg_idxs[0] = 0;
 			goto group_coded;
 		case 'Y':
-			idx = rds_state.udg_idxs[1]++;
+			idx = rds_state.udg_idxs[1];
 			for(int i = 0; i < 3; i++) blocks[i+1] = rds_data.udg2[idx][i];
+			rds_state.udg_idxs[1]++;
 			if(rds_state.udg_idxs[1] == rds_data.udg2_len) rds_state.udg_idxs[1] = 0;
 			goto group_coded;
 		case 'R':