Better handling for alternative langs