[~] some fix