diff --git a/src/vkcv/Context.cpp b/src/vkcv/Context.cpp
index 7170a4ab9630555feaa49b615b728362503feb37..179ee7409304b213b2b1f01aac870a44146a87e6 100644
--- a/src/vkcv/Context.cpp
+++ b/src/vkcv/Context.cpp
@@ -260,20 +260,21 @@ namespace vkcv
 		vk::PhysicalDevice physicalDevice = pickPhysicalDevice(instance);
 		
 		FeatureManager featureManager (physicalDevice);
-		
-		if (featureManager.useExtension(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, false)) {
-			featureManager.useFeatures<vk::PhysicalDeviceShaderFloat16Int8Features>(
-					[](vk::PhysicalDeviceShaderFloat16Int8Features& features) {
-				features.setShaderFloat16(true);
-			}, false);
-		}
-		
-		if (featureManager.useExtension(VK_KHR_16BIT_STORAGE_EXTENSION_NAME, false)) {
-			featureManager.useFeatures<vk::PhysicalDevice16BitStorageFeatures>(
-					[](vk::PhysicalDevice16BitStorageFeatures& features) {
-				features.setStorageBuffer16BitAccess(true);
-			}, false);
-		}
+
+		// TODO, FIXME: nach Tobi duerfen wir das hier auskommentieren. Es wird ein Fix benoetigt!
+//		if (featureManager.useExtension(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, false)) {
+//			featureManager.useFeatures<vk::PhysicalDeviceShaderFloat16Int8Features>(
+//					[](vk::PhysicalDeviceShaderFloat16Int8Features& features) {
+//				features.setShaderFloat16(true);
+//			}, false);
+//		}
+//
+//		if (featureManager.useExtension(VK_KHR_16BIT_STORAGE_EXTENSION_NAME, false)) {
+//			featureManager.useFeatures<vk::PhysicalDevice16BitStorageFeatures>(
+//					[](vk::PhysicalDevice16BitStorageFeatures& features) {
+//				features.setStorageBuffer16BitAccess(true);
+//			}, false);
+//		}
 		
 		featureManager.useFeatures([](vk::PhysicalDeviceFeatures& features) {
 			features.setFragmentStoresAndAtomics(true);