diff --git a/source/js/Core/Core/VMM.Library.js b/source/js/Core/Core/VMM.Library.js
index ceb1809..0191c46 100644
--- a/source/js/Core/Core/VMM.Library.js
+++ b/source/js/Core/Core/VMM.Library.js
@@ -280,28 +280,27 @@ if(typeof VMM != 'undefined') {
 				}
 			}
 		},
-		
+
 		prop: function(element, aName, value) {
-			if (typeof jQuery == 'undefined' || !/[1-9]\.[3-9].[1-9]/.test(jQuery.fn.jquery)) {
-			    VMM.Lib.attribute(element, aName, value);
+			if (typeof jQuery == 'undefined' || !('prop' in jQuery.fn)) {
+			    return VMM.Lib.attribute(element, aName, value);
+			} else if (typeof value != 'undefined') {
+				return jQuery(element).prop(aName, value);
 			} else {
-				jQuery(element).prop(aName, value);
+				return jQuery(element).prop(aName);
 			}
 		},
-		
+
 		attribute: function(element, aName, value) {
-			
-			if (value != null && value != "") {
-				if( typeof( jQuery ) != 'undefined' ){
-					jQuery(element).attr(aName, value);
-				}
-			} else {
-				if( typeof( jQuery ) != 'undefined' ){
+			if (typeof(jQuery) != 'undefined') {
+				if (typeof(value) != 'undefined' && value != null && value != "") {
+					return jQuery(element).attr(aName, value);
+				} else {
 					return jQuery(element).attr(aName);
 				}
 			}
 		},
-		
+
 		visible: function(element, show) {
 			if (show != null) {
 				if( typeof( jQuery ) != 'undefined' ){