@@ -1542,7 +1542,7 @@ function upload_image() {

         # NOTE: For backwards compatibility reasons, colons may be used in place

         # of semi-colons for property delimiters but they are not permitted

         # characters in NTFS filesystems.

-        property_string=`echo "$IMAGE_NAME" | grep -oP '(?<=-)(?!.*-).+[:;].+[:;].+$'`

+        property_string=`echo "$IMAGE_NAME" | grep -oP '(?<=-)(?!.*-).*[:;].*[:;].*$'`

         IFS=':;' read -a props <<< "$property_string"

         vmdk_disktype="${props[0]:-$vmdk_disktype}"

         vmdk_adapter_type="${props[1]:-$vmdk_adapter_type}"