Proposed fix for do_inspect