Hopefully fixing things