Fix export again. I really should write some tests, too.