Fix types. IT IS FUGLY