Fix Boolean Fields