Fixing special use case when it might happen that we get two keys with '?' as version number