Fixing key files issue