Put in a temporary fix for issue #123.