change  props
(cherry picked from commit 9a7bb20)