[PATCH 07/12] Changes per ticket #143.