[FIX] Update logic