added [FIX] comments