Another attempt to fix intermittent