Correctly guesses key size for 1.6
Completes 1.6