Rebinding algorithm was changed