Additional fix to document visibility issue - refs BT#7161