fixed bug (incl. SEGV), but still not Ok.