Dont check only first keypart Fix #129