selecting proper version

Change-Id: Ie0a4ac29bb3352b772cca00aadbdb37aa7e57c4e