Fix conditional boolean type