Yet another page load fix

I really need to try stuff out before committing it.