Repared the bug of double keychecks