old strange logic cleared