some fix v1.0