#381 Fix Boolean handling