code prop handling fixed