Changed algorithm for supported versions