addresses #711