Another attempt to get this fixed.