comment 46 fixes on bug 863160