fixed retake bug