trying to fix key mess