Not entirely sure what the fallback is doing, but we should see if we can use the information we have to make it more direct.