Related to #23. I couldn't figure out a way to test it in #24, which does (I think!) fix the bug. Testing this would be really really great.
