diff --git a/src/rds.c b/src/rds.c
index 6e93ea5..8a50be6 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -357,18 +357,10 @@ static void get_rds_group(uint16_t *blocks) {
 			goto group_coded;
 		// TODO: Add EON
 		case 'X':
-			uint16_t blocks[3];
-			for(int i = 0; i < 3; i++) blocks[i] = rds_data.udg1[rds_state.udg_idxs[0]++][i];
-			blocks[1] |= blocks[0];
-			blocks[2] = blocks[2];
-			blocks[3] = blocks[3];
+			for(int i = 0; i < 3; i++) blocks_udg[i] = rds_data.udg1[rds_state.udg_idxs[0]++][i];;
 			goto group_coded;
 		case 'Y':
-			uint16_t blocks[3];
-			for(int i = 0; i < 3; i++) blocks[i] = rds_data.udg2[rds_state.udg_idxs[1]++][i];
-			blocks[1] |= blocks[0];
-			blocks[2] = blocks[2];
-			blocks[3] = blocks[3];
+			for(int i = 0; i < 3; i++) blocks[i+1] = rds_data.udg2[rds_state.udg_idxs[1]++][i];
 			goto group_coded;
 		case 'R':
 			if(rds_state.rtp_oda == 0) {