fix up instrument fetching a bit more