ExternalCode changes per Chris Heath.
Merge pull request #1303 from setowns1/bug

ExternalCode changes per Chris Heath.