Another attempt fix.