Second attempt at fixing it.