OneClick Boolean Fix