Fix props

Change-Id: I7df10e819a2c40ee528e448b961fa2aeeefde8f9