bugfix: allow key override mechanism