Fixed #1711