but it also seems like it could be easily solved with a layer of indirection