Correct handling of boolean fields