manual gatherkeys fix