fix non unique property handle

Change-Id: I110feee77ab65bc8f528e85cba7c74063937b086