boolean problems fixed?