Fixing type resolution