fix key sourcing