Tix: 795 - even better visibility code