FIX Comment Issue