Genkey Standalone Fix