Fix of yesterdays pull request.

Files were not change or omitted.  This should be the real deal.