Fix props issue