Made set_handle parameter explicit too