fix uncomplie bugs