Deals with issue #31 - more to come.