bug #1748 adjustments