some fix but not working