fix handling of builtin chains
Merge pull request #271 from phemmer/fix_builtin_chains

fix handling of builtin chains