Experimental fix for issue #97.