diff --git a/src/main/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksHandler.java b/src/main/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksHandler.java
index 3c9ddc55237979ae0ba7f87f91a55340fcb6b25e..8fc959f4707ff421bc42d241ca47bfddf5fcb597 100644
--- a/src/main/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksHandler.java
+++ b/src/main/java/org/olat/ims/qti21/model/xml/OnyxToQtiWorksHandler.java
@@ -40,7 +40,7 @@ import org.xml.sax.ext.DefaultHandler2;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  *
  */
-public class OnyxToQtiWorksHandler  extends DefaultHandler2 {
+public class OnyxToQtiWorksHandler extends DefaultHandler2 {
 	
 	private final XMLStreamWriter xtw;
 	
@@ -105,8 +105,13 @@ public class OnyxToQtiWorksHandler  extends DefaultHandler2 {
 				rubricBlock = false;
 				rubricCharacterBuffer = null;
 			}
+			
+			if("label".equals(qName)) {//convert label which are not part of QTI 2.1 standard to span
+				xtw.writeStartElement("span");
+			} else {
+				xtw.writeStartElement(qName);
+			}
 
-			xtw.writeStartElement(qName);
 			if("imscp:resource".equals(qName)) {
 				int numOfAttributes = attributes.getLength();
 				for(int i=0;i<numOfAttributes; i++) {
@@ -136,6 +141,8 @@ public class OnyxToQtiWorksHandler  extends DefaultHandler2 {
 			} else if("prompt".equals(qName)) {
 				prompt = true;
 			}
+			
+			
 		} catch (XMLStreamException e) {
 			throw new SAXException(e);
 		}