diff --git a/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java b/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java
index <HASH>..<HASH> 100644
--- a/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java
+++ b/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java
@@ -112,20 +112,21 @@ public class TunnelCRI extends CRI
 	 *
 	 * @return layer value as unsigned byte
 	 */
+	// TODO maybe deprecate in favor of the enum version
 	public final int getKNXLayer()
 	{
 		return opt[0] & 0xFF;
 	}
 
-//	/**
-//	 * Returns the requested tunneling layer.
-//	 *
-//	 * @return tunneling layer
-//	 */
-//	public final TunnelingLayer getLayer()
-//	{
-//		return TunnelingLayer.from(getKNXLayer());
-//	}
+	/**
+	 * Returns the requested tunneling layer.
+	 *
+	 * @return tunneling layer
+	 */
+	public final TunnelingLayer tunnelingLayer()
+	{
+		return TunnelingLayer.from(getKNXLayer());
+	}
 
 	public final Optional<IndividualAddress> tunnelingAddress() {
 		if (getStructLength() == 6)
Uncomment enum version of tunneling layer, which is preferred over int