Added an additional check within enumeration section.