Fix for keys mismatch