Temporarily work around bug #332