TODO fixed by LOGIC-97 :-)