Another attempt at fixing it.