Take care of simni retake