Fix for Enumerables