Revert to inspect again because fixes cause another bug