Fixed #711