even more version/tag discrepancies handling