Right enumeration conversion #SCL-2141 Fixed