remove indirection; fix test error