fix ourselves