Hack: deal with layer of indirection for a moment