fix hanging panics (? for now at least ?)