Fixing type that is going to break a lot of code