Better year guessing. fix #609