[FIX] note: small bugs