Fix Boolean mapping