Enumerable type fix