Fixes #71

Not a pretty solution, but I can't figure out how to do it with one
database call.