fix for bugzilla 7693

enum and bool both fixed and pretty minimal