Seems to resolve #11, although it never seems to return empty. I think it's just a timing thing... but it's there just in case.