Another attempt at fixing this for both of us.