This is kind of breaking the API, but since it should be internally used only, it should be OK. Maybe.