some fix due reorganization