Fix inheriting props

Change-Id: I3fc61ad4b8111ef1210ac72645faa9d043833061