fixed issue with initial val and nationalMode