diff --git a/MECF.Framework.UI.Core/Converters/BoolReverseConverter.cs b/MECF.Framework.UI.Core/Converters/BoolReverseConverter.cs
index 27d0c41..1d68dae 100644
--- a/MECF.Framework.UI.Core/Converters/BoolReverseConverter.cs
+++ b/MECF.Framework.UI.Core/Converters/BoolReverseConverter.cs
@@ -8,15 +8,19 @@ namespace MECF.Framework.UI.Core.Converters
 	{
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{
-            if (value == null)
-                return true;
+            if (value is bool bValue)
+                return !bValue;
 
-            return !((bool) value);
+            return true;
         }
 
 		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
+        {
+            if (value is bool bValue)
+                return !bValue;
+
+            return false;
+
+        }
 	}
 }