ResolveFromString Fix