fix bug, which included at porting