Fix bug that prevented working enums in GUI
Merge remote-tracking branch 'origin/master'