some fix made