More Binary ENUM fix.