some fix in Lib