Resolve Type Issue