diff --git a/compiler2/record.c b/compiler2/record.c
index e544b845e01baa5352f60a4e14e752da6318af39..c17a6d7485fe7ea98a67ff1cb8730032ba57bfae 100644
--- a/compiler2/record.c
+++ b/compiler2/record.c
@@ -5455,11 +5455,13 @@ static char *genRawDecodeRecordField(char *src, const struct_def *sdef,
     /* field index of the otherwise rule */
     int other = -1;
     boolean first_value = TRUE;
+    boolean if_added = FALSE;
     int j;
     for (j = 0; j < sdef->elements[i].raw.crosstaglist.nElements; j++) {
       rawAST_coding_taglist* cur_choice =
 	sdef->elements[i].raw.crosstaglist.list + j;
       if (cur_choice->nElements > 0) {
+        if_added = TRUE;
         /* this is a normal rule */
 	if (first_value) {
 	  src = mputstr(src, "  if (");
@@ -5475,7 +5477,7 @@ static char *genRawDecodeRecordField(char *src, const struct_def *sdef,
       }
     }
     /* set selected_field to the field index of the otherwise rule or -1 */
-    src = mputprintf(src, "  else selected_field = %d;\n", other);
+    src = mputprintf(src, "  %s selected_field = %d;\n", if_added?"else":"", other);
   }
   /* check the presence of optional field*/
   if(sdef->elements[i].isOptional){
diff --git a/regression_test/EncodeDecode/RAW/issue560/.gitignore b/regression_test/EncodeDecode/RAW/issue560/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..ea42b2e26cdbf755e4360af31e3d37574eaf6774
--- /dev/null
+++ b/regression_test/EncodeDecode/RAW/issue560/.gitignore
@@ -0,0 +1,8 @@
+Issue560
+Issue560.exe
+Issue560*.cc
+Issue560*.hh
+*.d
+compile
+Issue560*.log
+result.txt
diff --git a/regression_test/EncodeDecode/RAW/issue560/Issue560.ttcn b/regression_test/EncodeDecode/RAW/issue560/Issue560.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..faf6fc97b1b5c9a377cf850a5456f85af1fbec8f
--- /dev/null
+++ b/regression_test/EncodeDecode/RAW/issue560/Issue560.ttcn
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * Copyright (c) 2000-2021 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+ *
+ * Contributors:
+ *   Gabor, Szalai – initial implementation
+ *
+ ******************************************************************************/
+
+module Issue560 {
+
+
+type union R_Union {
+	octetstring	other
+} with { variant "" };
+
+type record R_container {
+	integer		msg_type,
+	R_Union	u
+} with {
+	variant (u) "CROSSTAG(
+			other, 	OTHERWISE)"
+};
+
+type component CT{}
+
+
+
+testcase tc_issue560() runs on CT {
+     // Compile test. If compiled then pass.
+     setverdict(pass)
+}
+  
+  
+  
+
+
+control {
+  execute(tc_issue560());
+}
+
+} with {
+  encode "RAW"
+}
diff --git a/regression_test/EncodeDecode/RAW/issue560/Makefile b/regression_test/EncodeDecode/RAW/issue560/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..3efb2f594b283a5767ec36e4163512e3c7226fd7
--- /dev/null
+++ b/regression_test/EncodeDecode/RAW/issue560/Makefile
@@ -0,0 +1,149 @@
+##############################################################################
+# Copyright (c) 2000-2021 Ericsson Telecom AB
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+#
+# Contributors:
+#   Gabor, Szalai – initial implementation
+#
+##############################################################################
+TOPDIR := ../../..
+include $(TOPDIR)/Makefile.regression
+
+# WARNING! This Makefile can be used with GNU make only.
+# Other versions of make may report syntax errors in it.
+
+#
+# Do NOT touch this line...
+#
+.PHONY: all archive check clean dep objects
+
+.SUFFIXES: .d
+
+#
+# Set these variables...
+#
+
+# Flags for dependency generation
+CXXDEPFLAGS = -MM
+
+ifeq ($(PLATFORM), WIN32)
+# Silence linker warnings.
+# Overridden by Makefile.cfg
+endif
+
+# Flags for the TTCN-3 and ASN.1 compiler:
+COMPILER_FLAGS += 
+
+# Execution mode: (either ttcn3 or ttcn3-parallel)
+TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
+
+
+#
+# You may change these variables. Add your files if necessary...
+#
+
+# TTCN-3 modules of this project:
+TTCN3_MODULES = Issue560.ttcn
+
+# ASN.1 modules of this project:
+ASN1_MODULES =
+
+# C++ source & header files generated from the TTCN-3 & ASN.1 modules of
+# this project:
+GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc)
+GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
+ifdef SPLIT_TO_SLICES
+POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_))
+POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc))
+GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES)))
+GENERATED_SOURCES += $(GENERATED_SOURCES2)
+endif
+# C/C++ Source & header files of Test Ports, external functions and
+# other modules:
+USER_SOURCES =
+USER_HEADERS = $(USER_SOURCES:.cc=.hh)
+
+# Object files of this project that are needed for the executable test suite:
+OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS)
+
+GENERATED_OBJECTS = $(GENERATED_SOURCES:.cc=.o)
+
+USER_OBJECTS = $(USER_SOURCES:.cc=.o)
+
+DEPFILES = $(USER_OBJECTS:.o=.d)  $(GENERATED_OBJECTS:.o=.d)
+
+
+# The name of the executable test suite:
+TARGET = Issue560$(EXESUFFIX)
+
+
+# Rules for building the executable...
+#
+
+all: $(TARGET)
+
+objects: $(OBJECTS) ;
+
+$(TARGET): $(OBJECTS)
+	if $(CXX) $(LDFLAGS) -o $@ $^ \
+	-L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
+	-L$(OPENSSL_DIR)/lib -lcrypto \
+	-L$(XMLDIR)/lib $($(PLATFORM)_LIBS); \
+	then : ; else $(TTCN3_DIR)/bin/titanver $(OBJECTS); exit 1; fi
+
+.cc.o .c.o:
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+
+.cc.d .c.d:
+	@echo Creating dependency file for '$<'; set -e; \
+	$(CXX) $(CXXDEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< \
+	| sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
+	[ -s $@ ] || rm -f $@
+
+$(GENERATED_SOURCES) $(GENERATED_HEADERS): compile
+	@if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
+
+compile: $(TTCN3_MODULES) $(ASN1_MODULES)
+	$(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ - $?
+	touch $@
+
+
+clean:
+	-$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
+	$(GENERATED_SOURCES) compile $(DEPFILES) \
+	tags *.log
+
+distclean: clean
+	-$(RM) $(DEPFILES)
+
+
+dep: $(GENERATED_SOURCES) $(USER_SOURCES) ;
+
+ifeq ($(findstring n,$(MAKEFLAGS)),)
+ifeq ($(filter clean distclean check compile archive diag,$(MAKECMDGOALS)),)
+-include $(DEPFILES)
+endif
+endif
+
+
+
+diag:
+	$(TTCN3_COMPILER) -v 2>&1
+	$(TTCN3_DIR)/bin/mctr_cli -v 2>&1
+	$(CXX) -v 2>&1
+	@echo TTCN3_DIR=$(TTCN3_DIR)
+	@echo OPENSSL_DIR=$(OPENSSL_DIR)
+	@echo XMLDIR=$(XMLDIR)
+	@echo PLATFORM=$(PLATFORM)
+
+#
+# Add your rules here if necessary...
+#
+
+run: $(TARGET) ./config.cfg
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt
diff --git a/regression_test/EncodeDecode/RAW/issue560/config.cfg b/regression_test/EncodeDecode/RAW/issue560/config.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..bfb5d1ec3d5eecb747aa92e75918fc6494a1e688
--- /dev/null
+++ b/regression_test/EncodeDecode/RAW/issue560/config.cfg
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2000-2021 Ericsson Telecom AB
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+#
+# Contributors:
+#   Botond, Baranyi
+#
+###############################################################################
+[LOGGING]
+LogFile := "Issue560.log"
+FileMask := LOG_ALL
+ConsoleMask := TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
+LogSourceInfo := Yes
+[EXECUTE]
+Issue560.control
+
+[TESTPORT_PARAMETERS]