This indirection seems unnecessary