removed extra indirection