[PATCH 06/12] Changes per ticket #138.