fixed for the latest metadata