Inspector broken by last refactor