I think this fixes it.

My commit titles though. Sorry.