Probably fixes some stuff