Fix inheriting props

Change-Id: I468c793fee884fff5391e61deba07bded74e563e