I think this fixes some stuff.