Finish fix remain all bug