Fixes recent idetools breakage