Added key
More work on issue #1226
Resolves issue #1253