Removed enum dep.
Set fix.