changes to support ticket #98