aand fix related logic-fail too