Fix for parsing enum values
Merge branch 'bug/enums'