Boolean trouble fix