Resolve problesm with keys