Fix props

Change-Id: I589f564bc1c7107104618f83a1afbb24d9640373