Boolean fix