fix current_handle