INAV: Add braces to ensure statements are evaluated correctly