[Fix] Fixed type management