Fix Keygen issue