Boolean condition handler fix