fixed another issue with keys