Fixing handling of boolean