Making language option more robust.