Another attempt at a fix