Made hooper more robust (correct)