guesstype bug fix and enhancement