Fixing up type system