[FIX] Minor code fixing