Fix key handlers
Merge pull request #1577 from Mirantis/fix-key

Fix key handlers