Trying to fix orgid validation