Fix Boolean handling