Hackfix for #3.

We can do a proper fix when this starts causing problems.