Fix boolean problem