Work around to the haystack-whoosh backend issue #575