[PATCH 10/12] Changes per ticket #155.