Merge "Fix for assigning proper values"