Fixing key creation bumbles