Fix key api