Corrected boolean mapping