Another attempt at only returning the version we are interested in