Bug Fix: Properly handle enums