Fix properties recursive handling

Change-Id: I121428b0c482bd3dfd1b4eb8cbb1bb0d314c3e2a