Issue #12; used built key handling