a two-fer: #711 and #600