Fix all key logic