diff --git a/bacnet-stack/wp.c b/bacnet-stack/wp.c
index 2de36c23..ffba2772 100644
--- a/bacnet-stack/wp.c
+++ b/bacnet-stack/wp.c
@@ -217,7 +217,7 @@ int wp_decode_service_request(
       else if (tag_number == BACNET_APPLICATION_TAG_OBJECT_ID)
       {
         data->value.tag = tag_number;
-        len += decode_object_id(&apdu[tag_len],
+        len += decode_object_id(&apdu[len],
           &object_type, 
           &instance);
         data->value.type.Object_ID.type = object_type;
diff --git a/bacnet-stack/wp.h b/bacnet-stack/wp.h
index 799ff0c5..89756b71 100644
--- a/bacnet-stack/wp.h
+++ b/bacnet-stack/wp.h
@@ -62,7 +62,6 @@ typedef struct BACnet_Write_Property_Value
       uint16_t type;
       uint32_t instance;
     } Object_ID;
-    uint32_t Object_Identifier;
   } type;
 } BACNET_WRITE_PROPERTY_VALUE;