Fix issue 328 using the new num_internal_keys format parameter.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Fix issue 328 using the new num_internal_keys format parameter.