Fix issue after demo test