Possible workaround for issue #133. Shouldn't break anything else (I
think).