Bug fix for Retake button