fix handling of builtin chains
Merge branch 'fix_builtin_chains'

* fix_builtin_chains:
  fix handling of builtin chains