resolve fix