Fix 0017442: Enhanced Version definition

Fix 0017442: Enhanced Version definition