Experimental fix for issue #42.