Re-add intentional assignment in conditional